Use the event window of the menuitem to determine the monitor. This fixes

	* gtk/gtkmenuitem.c (gtk_menu_item_position_menu): Use the event
	window of the menuitem to determine the monitor. This fixes some

diff --git a/ChangeLog b/ChangeLog
index 7bc003ed56309ef6f090520183f9f75169a45635..ed0504084325258b39e6e1b9e9a65c2dd4719115 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,10 @@
 Wed Nov 12 21:40:10 2003  Matthias Clasen  <maclas@gmx.de>
 
-       Changes to improve menu positioning on Xinerama (#108328):
+       Changes to improve menu positioning on Xinerama (#108328, #126150):
        
+       * gtk/gtkmenuitem.c (gtk_menu_item_position_menu): Use the event 
+       window of the menuitem to determine the monitor. This fixes some
+
        * gtk/gtkmenu.c (struct _GtkMenuPrivate): Add a menu_num field
        to store the monitor on which the menu is to be positioned.
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7bc003ed56309ef6f090520183f9f75169a45635..ed0504084325258b39e6e1b9e9a65c2dd4719115 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,7 +1,10 @@
 Wed Nov 12 21:40:10 2003  Matthias Clasen  <maclas@gmx.de>
 
-       Changes to improve menu positioning on Xinerama (#108328):
+       Changes to improve menu positioning on Xinerama (#108328, #126150):
        
+       * gtk/gtkmenuitem.c (gtk_menu_item_position_menu): Use the event 
+       window of the menuitem to determine the monitor. This fixes some
+
        * gtk/gtkmenu.c (struct _GtkMenuPrivate): Add a menu_num field
        to store the monitor on which the menu is to be positioned.
 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7bc003ed56309ef6f090520183f9f75169a45635..ed0504084325258b39e6e1b9e9a65c2dd4719115 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,7 +1,10 @@
 Wed Nov 12 21:40:10 2003  Matthias Clasen  <maclas@gmx.de>
 
-       Changes to improve menu positioning on Xinerama (#108328):
+       Changes to improve menu positioning on Xinerama (#108328, #126150):
        
+       * gtk/gtkmenuitem.c (gtk_menu_item_position_menu): Use the event 
+       window of the menuitem to determine the monitor. This fixes some
+
        * gtk/gtkmenu.c (struct _GtkMenuPrivate): Add a menu_num field
        to store the monitor on which the menu is to be positioned.
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7bc003ed56309ef6f090520183f9f75169a45635..ed0504084325258b39e6e1b9e9a65c2dd4719115 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,7 +1,10 @@
 Wed Nov 12 21:40:10 2003  Matthias Clasen  <maclas@gmx.de>
 
-       Changes to improve menu positioning on Xinerama (#108328):
+       Changes to improve menu positioning on Xinerama (#108328, #126150):
        
+       * gtk/gtkmenuitem.c (gtk_menu_item_position_menu): Use the event 
+       window of the menuitem to determine the monitor. This fixes some
+
        * gtk/gtkmenu.c (struct _GtkMenuPrivate): Add a menu_num field
        to store the monitor on which the menu is to be positioned.
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7bc003ed56309ef6f090520183f9f75169a45635..ed0504084325258b39e6e1b9e9a65c2dd4719115 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,7 +1,10 @@
 Wed Nov 12 21:40:10 2003  Matthias Clasen  <maclas@gmx.de>
 
-       Changes to improve menu positioning on Xinerama (#108328):
+       Changes to improve menu positioning on Xinerama (#108328, #126150):
        
+       * gtk/gtkmenuitem.c (gtk_menu_item_position_menu): Use the event 
+       window of the menuitem to determine the monitor. This fixes some
+
        * gtk/gtkmenu.c (struct _GtkMenuPrivate): Add a menu_num field
        to store the monitor on which the menu is to be positioned.
 

diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 312c511070e57e6f1597c6bc30cba4f6ecf01ff2..3cb2b948f5dff4d3028d012f3f08ff5d1242b087 100644 (file)
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -1024,7 +1024,7 @@ gtk_menu_item_position_menu (GtkMenu  *menu,
   theight = GTK_WIDGET (menu)->requisition.height;
 
   screen = gtk_widget_get_screen (widget);
-  monitor_num = gdk_screen_get_monitor_at_window (screen, widget->window);
+  monitor_num = gdk_screen_get_monitor_at_window (screen, menu_item->event_window);
   if (monitor_num < 0)
     monitor_num = 0;
   gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);